From d909ee8778037a8e010485d23189ac7060a42f44 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 4 Dec 2007 10:04:00 +0000 Subject: [PATCH] vnet: Fix compilation. Signed-off-by: Samuel Thibault --- tools/vnet/libxutil/Makefile | 2 +- tools/vnet/vnet-module/Makefile.ver | 6 +++--- tools/vnet/vnet-module/sa.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile index 0e790c5831..3d490f0971 100644 --- a/tools/vnet/libxutil/Makefile +++ b/tools/vnet/libxutil/Makefile @@ -24,7 +24,7 @@ LIB_SRCS += util.c LIB_OBJS := $(LIB_SRCS:.c=.o) PIC_OBJS := $(LIB_SRCS:.c=.opic) -CFLAGS += -Werror -fno-strict-aliasing +CFLAGS += -Werror -fno-strict-aliasing $(call cc-option,$(CC),-fgnu89-inline,) CFLAGS += -O3 #CFLAGS += -g diff --git a/tools/vnet/vnet-module/Makefile.ver b/tools/vnet/vnet-module/Makefile.ver index dcd6e0f736..14dd722bb7 100644 --- a/tools/vnet/vnet-module/Makefile.ver +++ b/tools/vnet/vnet-module/Makefile.ver @@ -20,14 +20,14 @@ LINUX_SERIES?=2.6 -LINUX_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/pristine-linux-$(LINUX_SERIES).* 2>/dev/null) | \ - sed -e 's!^.*linux-\(.\+\)!\1!' ) +LINUX_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/linux-$(LINUX_SERIES).* 2>/dev/null) | \ + sed -e 's!^.*linux-\(.\+\).hg!\1!' ) ifeq ($(LINUX_VERSION),) $(error Kernel source for linux $(LINUX_SERIES) not found) endif -KERNEL_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/build-linux-$(LINUX_VERSION)-xen* 2>/dev/null) | \ +KERNEL_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/build-linux-$(LINUX_VERSION)* 2>/dev/null) | \ grep -v -m 1 -e '-xenU' | \ sed -e 's!^.*linux-\(.\+\)!\1!' ) diff --git a/tools/vnet/vnet-module/sa.c b/tools/vnet/vnet-module/sa.c index df3f4edc5a..a3505ed97d 100644 --- a/tools/vnet/vnet-module/sa.c +++ b/tools/vnet/vnet-module/sa.c @@ -16,7 +16,6 @@ * 59 Temple Place, suite 330, Boston, MA 02111-1307 USA * */ -#include #include #include -- 2.30.2